Adding routing, new apps