add todo list
move some stuff around