Checking in progress on juibase refactor.