Design & Build Review: Issue 22

main