Scott K committed [6251cc]

more refactoring - moving closer to final design