I did this back in July. I reposted the image because I think it got deleted.
Could have saved you all the work.
http://www.therpf.com/showpost.php?p=374958&postcount=50
FB
I still found those diagrams somewhat confusing, wasnt sure which one was the right one or not.