Time step now works/no more static

static refs just cause problems