some design stuff
merged
progress