Heya,

Wow, this is really nice work! :D

The first patch LGTM.

    -- (