Cleanup some stuff
Basic functionality working