Baseline design done, partially resolves issue #50