Moved some logic around, started work on better camera