Working on social aspects for #39