Made it more of an api