Timeframe edits
time frame edits2
Fixed timeframe, able to post to server
Merge branch 'continuing'