Finished up with switching all classes over to using the newer feature declaration structure.