WIP; about to rework code for 2nd prototype