Add new features
Demo version (Sprint 1)