Added all methods, started on methods