Added TODOs

Just added the TODO's for stuff I haven't finished yet