master: functionality complete

Will still add pleasantries like a reset action, final touches.