Complete build. Just needs further testing.