Refactoring to use new paradigm. This is so much better.