Even more work on build