WIP support for Kaveri
More stuff