commander rewrite almost completed, WIP