Adding some todo's...