Moving the build to an instance method where should have been to begin with.