first part of refactor - no longer needs tbc and does better with time glitches