unrefactored, serious issues with tie-ins, think i need a module