jh - fully merged but still broken. need to rework scenes, prefabs, and scripts