wip
Added simulator and --test option to cli