simulation refactored

needs to move on to a more complex outcome DGP