Building this out as a class. That last way was hard to use.