wip/mk-configure
