Move TODO into a separate file
Add log file