Added TODOs 'n' stuff