Finished TODOs from last meeting + Appendix