Merge pull request #7 from nealcpeters/routing

final split up and work merge
finally figured out the fucky thing.