Added bunch of stuff including camera control