Adding methods, will have to split into separate classes soon