Adding in api stuff
Bad merge