NOJIRA Starting the refactor