Remove TODOs
Rename lots of things