Starting to add support for swaths.