#533 - Adding TODO for next step in database refactor