Time Window and Cucumber Fixes

Implemented basic time window and fixed some failing cucumber tests