Design updates
fixes #7