Micro-optimize
Add testling