Next step is to fix the numerous clirr errors.