Add model, utils, new routing