[wip] modularizing