Cleanup mostly...

Added @TODO for the next big attempt also