overhaul/cleanup as part of the fork to release as a standalone rotation