Update for refactored kernel
Update todo

Still a lot to do ):