A teaching and learning environment contains data representations of information and knowledge, these being resources, materials, and other artefacts. We present a pedagogically informed model which represents the learner’s knowledge, being their capability with respect to some subject matter and context, and outline an implementation of the model in a prototype knowledge mapping tool. Recent results have shown satisfaction and learning improvements. In the paper we discuss the extension of knowledge mapping to include contextual elements and the extension of the prototype tool to include selfassessment and learner analytics.