Initial commit with Jana's contribution