Design review one

Changes after review with Sasquatch. @aduggin @andrewgarner