merge/pop conflicts fixed
Restructed because I felt like it.