Merge basic design + first feature specs