omg merge conflicts
not dealing with the conflict nowww
fix window open