Loc: Updated to use lookup table

Tests are passing again!

Lint!