! better account for addons in this as well

Signed-off-by: Spuds <spuds@spudsdesign.com>