Tested and working

Some scuffs