Pretty much revamping everything