Further testing on ECS + Camera handling.

Correct workings now.