Adding includereplace. Not finished yet