Merge pull request #1 from mfhholmes/master

todo list step 1