WIP on comments
https://app.asana.com/0/5336770534932/11169835259598