Adding the solutions for the logic and building block