Redo surface component initialization (Stage-1-9.1)

Ideal engineering time: 3 days
Much of this is completed in Mariana's work with MCT.