Finished placing API in separate class