initial commit
Merged with linkz