added Dales stuff and did basic integration
Merge branch 'master' of github.com:danheidel/alongtheway

Integrating Dale's code into master