Hunch #1

First of two hunches I can trying to get the offsets working right
without having to use a rotation cache.