Add comments, and todo list (might be better to move that somewhere else)