almost done with user view stuff, feel free to pull