Updated Outcome class

Still need some unit tests, but should be working