pull in changes from main app, use new stub data