making app even more modular