Turning it into a class