Initial commit (collaborative scheduling), still buggy