Advertisements added as well. Again untested for now, I'll sort some proper testing and configuration on Monday =)