Continuing to hack on rfc2445 stuff