temporary manually merged version with develop as of Nov 19, 6PM PDT; still has some cell displacement bugs but overall looking great