Temporary: Looking after refactor. Don't want to pollute old repository if decide not to do it