build out a lot of stuff
Merge pull request #4 from amsheehan/alex

build out a lot of stuff