Finished rotation stuff; working on 2.2