Functions+to+Structures

Add the functions to the structures