Merge attempt, hope for the  best
Fixed merge errors, runs now