Some todos in appendix