remaining TODOs.
Merge branch 'master' of https://github.com/spillow/cerealhack4