mostly done
Merge pull request #1 from joshuamaxwell/joshua

mostly done