moving things around
Merge pull request #5 from themattgoldfarb/deletingOldCode

moving things around