Updated timestamps to be smarter about relevant data
Reworked shuttles network calls to a singular function for easier transfer later