Squariing tasks added.
Merge conflicts resolved