Arguments handling ok. Work in progress