Added the rest of the methods that need to be coded