big ol' refactor
big ol' refactor