minor refactor ... getting to the final design