Committing some more changes before blowing away wonky local copy of app