Refined the whole model (again). Simplified the DOM wrappers.