refactored shit into gold, in progress
refactor ongoing