Reduced spanglish to the bare minimum
Tests! Need quite a bit of refactor though