Working on #34. Made changes per my notes and James' approval.