Replaced more core stuff with evervolv codebase