Updates to remove unnecessary replication
Closes #3
A fully working system still requires issue #4 to be closed