Significant rearchitecture and nearly working again