Added initial work for 2) in warmup project