Update simulation to accept new arguments
Start working on helper functions to make more useful output available