Final touches to iteration 1