Still figuring out git: tidying up attempt 1