Heavy comments for testing.  Moved around src files