worked on it a bit
Somehow got it to work
Done for tonight
Fixed some merge conflicts