Further progress on the build. Just need to wrap up the production build now...