reworking some old stuff for some new stuff (#workinprogress)