Begin refactoring to use processing 2