WIP move trail model (fixes #370)