Clean up method names
Working simulation!  Now I am going to play with the values