Works for 2999 (should work for everything without a D)
Works for 2540 (and should work for everything)
Added a bunch more tests for verification