Base Structure done, api implementation done