Begin refactor to update with a focus on America not panicking