Create seperate to_val functions.
Fix include.