First draft of full build working