Apsb13 03 take 2

First pass at addressing all of Tod and Juan's feedback on PR 1717