WIP: remove TODO
WIP: check is owner or future owner
WIP: more refactoring
WIP: move helper