Preliminar version

A lot of options added