This paper reports on a work in-progress scenario of a computerintegrated classroom (CiC) with a focus on document management and document sharing. Following a brief introduction on the topic of distributed (distance) and non-distributed (face-to-face) learning, the systemś functionalities and architecture are being described, as well as the file structure to be found in the document archive. The system uses a unique type of XML document that can be created and edited by the FreeStyler application. The paper then concludes with a short description about the future work on the project.