Added TODO in regards to rotation