Refactoring, first few sync endpoints