TODO

For comments and reorganizing/prioritizing by Jean-Baka.