The package isn't that hackish now.