Getting close to a working camera swap