Update todo
Add OOEV support