Less repitition

Also add a todo list.