Restructuring, getting simulation to work