I'm going to try forking official plugin this weekend.