PACK-22: Major clean up. Dialing everything in.