This probably shouldn't be a class any more and should just be a collection of functions.