Moving the method stuff into its own class to make for a little easier testing.