Added count method to models
Commenting and semantics