This will break building but I want to save what's been done so far