Added skeleton for optimized versions
Added command line select
More changes