More work on the rewrite

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>