Started adding api infrastructure