Continue working towards following our own spec. Should be mostly done now