Add skeleton for new combiner; mess with IntelliJ stuff