working toward rotational fixes. major changes here