Made a start with things that didn't fit last time, ready for your suggestions