Updated to use new module for function.
First steps on section 5.