Started adding API stuff