Added some TODO´s