Added some things that need to be tested