Add Aid me stuff (doesn't yet work)