Christian Weeks:
	- Fix up bubble support
	- Add in bubble support
