Pull request from Team Stream

Comments/suggestions related to the app's architecture would be appreciated!
is this method ever called? it doesn't seem like it.