Everything

Eventually we'll pull some code into the master branch ;-) Until then, work-in-progress will be updated on this branch.