Tighten it all up - assn04 should be ready for deploy.