squashed sum of all our refactor efforts