proposing a plan in #70 - but lets not mix this into this PR. i will wait until this is merged, then do a new PR.