promote re-write to be the implementation, start documenting