Working State

updated code to get the app to a working state.  pre and post flavors
still broken.