Mostly working

Still need to sync up the PGS data with the view.