Added some half done stuff