Function calls working again.

Last step is to get includes functional