Almost done - some problem with rotation