yesterday's code, working on making addons more reasonable.