Multiple changes made... API working to a degree