Make it work

Partially