CarstenAgerskov Refactored, prepared for better due date/time