initial commit to ians branch. more work to come tonight
Ians commit for the wednesday deliverable
Merge pull request #1 from samaratrilling/ian

automatically merging changes from ian branch