PLAT-4705 - TODO items, notes, refactoring