Functions now handled, test must be written