Model enhancements
Broke the collections stuff trying to get charging to work