This should be a module and not a Class