Changed up the API strategy a bit