Second version committed.
Progress on concrete classes