Separated todo and location