tentative reworking
rework #2`
more rework, but broken build