SD code uncommented to run on actual system; some code reorg / commenting