Getting close to done with Athena UG conversion