Added some more stuff to handle the rotation. In class right now so
can't test until later.