Initial Merge to production (#14) (#15)

Co-authored-by: justin-phxm <113923596+justin-phxm@users.noreply.github.com>
Co-authored-by: hannagracec <hannacho847@gmail.com>
Co-authored-by: Natalie <natalie.yeung16@gmail.com>
Co-authored-by: natalie.yeung <102062208+nataliey16@users.noreply.github.com>
Co-authored-by: Hanna <144185720+hannagracec@users.noreply.github.com>
Co-authored-by: Burton Jong <108391733+burtonjong@users.noreply.github.com>