Updates to remove unnecessary replication
Closes #3
A fully working system still requires issue #4 to be closed
Missed file from previous commit
Merge pull request #6 from theodi/iss2

Closes #3