WIP implementing backend
Fixes merge conflict