interesting. should we put this in base app?