Everything working, including time step computation