all working

Several design changes