Fixing things on the TODO list
Merging conflicts