[Graeme] More type stuff