Initial version plus additional fixes (not working yet)

Signed-off-by: David Zafman <david.zafman@inktank.com>