adding work on modularization https://app.asana.com/0/15843277689885/16117410053485