Implemented first feature that would go to production!