updated orderplan + report code refactoring for easier time buckets