wip: Ant hacks - not complete