refactor consolidation fornication
stuff
alot of stuff
coverage
bot fix