Added Jonathan's files to the Solution.