placeholder; test
first draft of documentation; example code to follow
merging changes; resolving conflicts