Bundlerized. Refactored. Still a wip.