Nearly done, only a couple details, some cleanup and the base left