Design & Build Review: Issue 27

main