Two new toys

It should be fixed and ready now.