Mostly finish up views