Added Locomotive and other NJS stuff