Add command line and stuff