First commit of the working solution