Start adding features for combined continuous / discrete event simulation