Tested and working

In great shape