Inc version
Add files which are unused but may be important in the future
Merge branch 'master' into mbta
Revert "Attempt at reducing memory usage. Redundant fields are removed"

This reverts commit 05da05cecb1a8932cdfb6f796f9dc1e520b7b076.
Merge branch 'master' into mbta
Inc version