getting app more modular to easier further implementations