More merging of fronted and backend code

Super refactoring