Nice work, from what I can tell (considering the lack of sleep last night) its spot on, been meaning to write up a simplified version myself.
Now just need one for Domino and GroupWise