Add a bunch of TODOs
Remove some waffle comments; add todo around making init transactional