Finish implementing ad support

[noupdate]