more refactoring, more stability to the build...ahhh feel the power