Forgot about static classes; design simplification; a few bug fixes.