Tested and Working

Some scuffs