feat: Merge new features with features in total app not covered in classwork
feat: Merge new features with features in total app not covered in classwork

qgreg/conferencegqw,qgreg/conferencegqw,qgreg/conferencegqw