Organized TODOs in preparation for writing shell drivers