Design & Build Review: Issue 32

main