Merge Promise fixes and basic camera interpolation