Out of date partial changes. About to rewrite.