J!3 compatible initial commit