Distribution (WIP)

#284:

Change request updated