Add rest of methods, split into more files