I am going to merge it for now, we can figure out a better way to handle this in the future.