Tie in the last few bits, standalone is up and running, #184