New push with backend and unit tests
Conflict fixes with old merge