Adding minimal work on prototype. Maybe blocking is not needed. Testing still misses.