Refactoring ectools, adding things here