Updated build, final refactor touches