Made Patterns more rigid.
Task2 should do now
Some work on task4

- Should be ready to test soon