not done but updated some dependencies that kyle needs now
fixed merge conflicts
Merge pull request #9 from kyledaugherty/station-funcs

Station funcs