foundation stuff
Merge pull request #1 from amsheehan/alex

foundation stuff