A few more changes, trying to get app back to working state