added Invoke-UserView
start of code cleanup/merging