More work converting Athena UG to Demeter