Current state: Tim's original;Kit's notes;Lou's mods to master