Version 1.8 - ALL done, commenting left