Added headers to files + To Do on init