addressing brad & others comments, will squash before merging