rearranged to match order parts being implemented
Merge pull request #5 from bencoman/patch-2

rearranged to match order parts being implemented