Allow optional wrapping of ant
Add support for multiple ants, refactor