Made it more like an API