Don't use Resources
Fix performance tweak
Add test
Get rid of constants

We'd like to make these values configurable.
This is a first step
Add test