expand conditionals into two sections
incorporate devon`s changes
Fix botched rebase conflict resolution
word choice consistency fix
Delete unused model attributes