rearranging
Merge pull request #213 from ryanpcmcquen/master

rearranging