tues pm, more progress on design & refactoring