Added PROPER CAMERA STUFFF!!!!!!!
fixed merge conflict, we in a heap of trouble with camera rotation