More migrating to OO for Agate