Changed some things with how the API stuff will work