Merge pull request #2 from ccummings/wip

Refactoring day 1
Merge pull request #3 from ccummings/wip

Refactoring day 2
Merge pull request #5 from ccummings/wip

Testing & Refactoring
prevent ide problems by adding .idea to .gitignore
added in a .gitignore; make sure you save your own local