refactor like a boss
first half of active test working