Tidied up lab4, started on lab5