Made many changes, see google drive document: https://docs.google.com/document/d/17hEGtO3U4-pIDfZCMJrAz347KG4PFzfpxM_SerobBwY/edit?usp=sharing