Long time update...

So I forgot to update the repo as I went along. Here's three weeks worth
of work in one commit!