Fingers crossed that I didn't kill it.
Merge pull request #1 from majense77/backEndBranch

Fingers crossed that I didn't kill it.
Hopefully fixing conflicts