about to add shit
Merge branch 'andy-branch-3.0'

Conflicts:
	registry