added a comment
retab
more TODOs
indent
lots more comments, renaming of things - needs finishing up