Added friends app and continued refactoring