Merge
Added old files
Updated todo