Added todo to pick moving