Sure I'll try to tackle it with @hazzik together, joined the discussion at #74