break args out into list so we can actually read them
add time step member and arg to constructor. fix math bug in controller
Merge remote-tracking branch 'origin/master'