- Removed simple wrapper implementation, it was problematic especially with timesteps
Started switch to timestep