issues: more fields, TODOs