Add main and commandline