WIP debugging
Debug comment out offending lines
Revised for mavericks config