Added function logic header and updated test to test new features.