Massive overhaul. Targetting stable release.