Updated TODO

Guard basic behavior is finished!