whatever kyle tells me to do
fixed merge conflict
fixed round edit and refined a few views