Locomotive now supports multiple parameters

Cleaned up some code as well.