trimmed the Collection class and started using the Models class as its base, fixes #36