Steven backend refactor