As all points from the epic refactor issue are closed #47 (closed) I am merging this in to master in order to unblock development.