Made it into an object