wip - Refactoring processor to be more generic