Initial and final commit. JD