Almost done with Community base API