Testing addon system
TEPPELIN COMMIT:
	- Patched up addon system some more.