added limited camera functionality
merge