Major refactoring of code.