Major complexity reduction refactoring ...