beginning to split out addon