Finished week two problems as much as can be bothered