Begin making multiple camera support more generic