Group done, functionality from templates broken, time to switch to rest WS