Once #26 is completed and the legacy app / router is cleaned we can move to updating to better patterns / cleaning up code
Once #26 is completed and the legacy app / router is cleaned we can move to updating to better patterns / cleaning up code