Revert "Revert "PRIMER COMMIT""

This reverts commit 02088fe9ffd56d37c05cc1e343ef1af0fc47e728.