Polished the turd - added comments for future code maintenance
Resolved merge conflicts
Merge branch 'CMD' of github.com:David-Parker/API-Builder into CMD