Bundle disable
This is merely an update to get various changes I've made onto GitHub.