Added stubs for what needs to be done next (indicated by the TODO comments, they can be seen using "Tasks" in Eclipse)