more wip ...; things are coming together...