did some horrible things with command line but fixed now