Initial revamp commit