More work getting the code re-architecting to compile