Breaking it out a little more, using convenience functions and general breaking out of the code