Partial progress on S7C5 - still broken, though.