Initial commit of solution

Source as at 1.0.8