WIP commendation refactor