Commit the solution

Full commit