Major changes. This should be the build to use as a good start point