committing progress... trying to fix rotation