Got it running

Lisa, this is the pull request you asked for, but we can't get it running still (we upgraded android studio today).