serious refactor from 32,000ft
more 32,000ft refactors