Adde the rest of the Wonder funcionality,

Tested.