begun transfering/merging everything into the cleaned up layout;  can expand and minimize now;  taking it function by function