Solution finished

Finished solution