File changes made by Alan

He gave some pointers on how we need to approach this and made some useful changes to the files to get us a headstart.