Hopefully committing a working version with appcompat