Made it into a class