WIP: Narrowing Case 1 a little.