Update Package

Needs more work, but good enough for now.