Jimmy and Oli's makefile edits - first version