Added officers section
Add TODOs so I don't forget