Adding refactor changes into the dev_site branch

I accidentally branched my refactor changes from the master branch
without seeing this old dev_site branch which contains some work we want
to save. This brings all of the good changes over from the refactor into
this newer dev_site branch