Working on implementing our own processor
merged conflicts