initial commit... i think
Cleaned up test comments
Merge origin/master