Added todo list, and may have broken something....