Started changin view holder to inner classes, but not finished. Also implemented long press to edit.  Need to finish view holder conversions.  Switching now to start locations.