Modifier.js should be broken into one function for echelon and one for mobility for ease of code maintenance.