Provide for officer removal
Resolve merge conflicts