Add TODO
Add test for disregard of None
Retry until move is Some