Finishing the basic wireframe implementation