[WIP] Updates from CV 103

### Description
Forgot to delete old code after this?