Working on gitwar core