Making some big changes...
Merge pull request #1 from fcwheat/master

Making some big changes...