Yep that's the one. My current saving solution isn't very scalable, so I'll have to work on this anyway.
