Rewrite CLI to use Commander and allow setting custom port