Added comments/todos