arrrrrrgh2
Adding rotation support