much better cmd line stuff