finished modifying code. Need to move Views