Moved todo into seperate file