Update Kickoff

Merge changes from zander-dev branch into master. Lots of major and minor tweaks and fixes.