rework command generation
Add tup generator