Final

Everything has been implemented and tested. Pushing it over to the
little bro for the final test.