Commited first version of the tool