Charter Review expects final draft ready for May