mostly working - still non-functioning leaving and comments