Intermediate commit, not all working yet
Getting closer now
no msg
Merge pull request #1 from CTownsdin/devBranch

Dev branch