So I changed a lot of things.... but it works.. sort of
Fixed a surprisingly small number of conflicts