New schedule implementation

Should be ready to go ....