full refactoring
fix
full refactoring
refactoring
Full support, except output options