The rest of the previous build

This is the rest of what should have been pushed previously.