Added some things that still needs to be done...