Simplified
Some restructuring - working but tests often failing