Merge first working build into master