Some more MagicHandler updates

These definitely aren't final!