Extension

A few minor things to be finished off, but it's essentially finished.