(edit) latest updates to backend refactor