First run through. No errors. Testing Now.

I've convereted all the menus over to the better
handling mechanism. Hopefully we won't encounter
andy more oddities.