Adding mario's work from his repo...hopefully its all intact...
Logan's work for now
Merge pull request #1 from hughes88/development

Development