Merges Nate's raw changes (needs some more work, like default constructed components)