Some reorganization and a bunch of TODOs for planning