UPDATE:
Since I've got back from holiday, things have been a little crazy around here so I haven't been able to get as much done as I would have liked. However we have another bank holiday this weekend which this time I don't have to go anywhere! I'm planning to use the time to make some good progress.