major extension finished, tested (but not thoroughly)
todos worked on, comments added