Further edits to get backend integration to work