Commit

Commit before attempted move to linux 12/24/2014