More work on the re-write

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