First pass on the Commander done