City getting closer to 'contracted model' for e-scooter and