beginning to generalize and streamline data service
Merge branch 'master' into streamline
working streamlined buttons
commented out dummy buttons
Merge pull request #11 from jpk1215/streamline

Streamline