Another merge

Other document with todo list thing's worked on.