bring in work from the wip branch, tangling the files from an org into the actual source code so it all works.