Merge pull request #2 from rickcid/mod2

Completed Mod2 work.