Committing latest refactoring run, minus restriction enzymes being fixed.