Refactored for the greater good. 0.3.0