The next step will go into the core functions.