This talk discusses the paper "Continuous Finite-Elements on non-conforming grids using Discontinuous Galerkin stabilization" where an a-posteriori error estimate for Poisson and Stokes equation is presented and hp-adaptivity for conforming Finite Element discretizations is used to solve these problems. In addition we discuss the implementation which was carried out using the DUNE-FEM framework and recent improvements to the DUNE-ALUGrid module.