Filling out some implementation items. Lots of TODOs