more refactor http://pinkie.mylittlefacewhen.com/media/f/img/mlfw9615-Untitled.png