* wip * finishes initial refactor * prune unused code * finished massive refactor * remove commented deps * fix import * fix bug