Stuff

Ecto 1!!
Cleanup

Lots of cleaning up