-final commit for tonight

-added lifp and clamp testing