Added functions, haven't tested them yet