Improved Waila integration, still not sure why it isn't working.