Added rest of function protos, merged