Development changes

Made it more generalized so it does not require the local version to be enabled manually. Makes life easier