008.05 More initial codebase update work