NB: all commits (from master) pass tests up to this point.

fix: squashme into use core constructor