this has become a bloody mess, I've made attempts to remedy it. but a commit is needed before I go wild in deleting and rearranging things even more