blocked out some more levels
merged ch with master