SQUASH THIS: More progress on friendapi rewrite