Right, I haven't thought about future extensions :confused:

Updated.