Consolidated todo files
Further work on todo items