Lots of edits and updates.
Emergency commit to save what's been achieved so far.
Emergency 'holy crap, everything's working' commit.