Major overhaul; package is complete and stable