First merge with backend, few methods done