more design changes, almost done.