Some modifications
Started on List/Either/Option co-op