fix time
Merge branch 'staging'
add some test
more test
more test....ugh
fix staging seeds?