Nearly complete, investigating if there are other APIs I should try and incorporate