added all stuff
working solution
working solution