Merge Level builder changes into finished