master: a-0 did a bunch of work cleaning up and adding rotation delete