With slight updates to api routing