today's second major refactor. I'm much happier with this now. It's simpler