Finished conversion to new track <-> train system