Giant ass commit from the last couple months