More JIC commits.

This time, I have some work on the camera switching.