Made it a class