Merge and close

I checked client-side for bugs during merge. I'm switching focuses so I don't want code stagnating on the branch.