Revert "Revert "Begin transition to updated Students and Adults""

This reverts commit 12641c1211cebf121a854c5e4bbf9041aa6eb80f.