Initial implementation of Pattern
Resolved conflicts