Fill out most of the remaining sections
Fill out most of the remaining sections


Former-commit-id: f5db5eb9bca611b06b8b0d8d18c8d2a047244522
brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg