Refactor.  Should automate build and release next.