Added models, helpers, and tests