Add basic unwrapping

IMHO this desing is good enough to enter standard development loop.