Additions and rearrangements.
Merge pull request #1 from bdw429s/master

Additions and rearrangements.