More moving about of things, and a few more steps towards a stable speed model manager API