Design implementation

 - [x] Outline specific lines to change and to what
 - [x] Investigate side effects, and discuss about possible issues/solutions
   - [x] Create a PR to merge into our own master
         (Don't actually merge, this is for us to see the changes)
         (Don't have to work and can be kinda psuedo and/or comments)
 - [x] Implement changes from our feedback