Bulk commit of last changes from Eurucamp

Just realized I hadn't committed these yet. This whole thing is a throwaway
prototype anyway. But "it works", there's some stuff to keep in there.
Saving it to GH for reference.