Initial design, in need of some thought