massive changes to views argument structure