Trying to wrap up LDP

Related to issue #9