Started working on processing
Fixed merge conflict.