Added some TODO's
New Version of Website