Resolve #4 - Prototype