GOOD CHANGES
More good changes
merged friends model with working awesomeness.