Segregate ads

Addresses #190, clear to merge