Added rotation.  Still needs cleanup and json review