Shuffle things around trying to fix camera