Moved todo to waffle