Reworked API service -- Needs work