finished locomotive refactoring
id's are now strings