stash
Cleanup some TODOs
Some more cleanup