Refactoring - multiroutes, helpers, move some logic to models