Waila integration (Again, this should be good now)

Hoping that this works!