Initial ideas and skeleton for challenge 2
Image feature now working
Merge branch 'chal2'