Added id to functions, testing, a function
Added Function Signatures
Merged with newNadine