Reworked things to work with an actual API