Added wage calculation based on category, class, echelon, but dropped category since it isn't used (class implies category)