mark: sorted out problem 3
mark: tidying up into weeks