Added TODOs, to clean up my whiteboard ;)