Add basket, badges services. Remove unused stuff.