initial commit, circular references still a problem
Merge github.com:matyb/leh