the most important commit
resolved merge conflicts...and then some
resolved merge conflicts. darn you Jiatao. daaaaaarn youuuuuu.