Merge Request!

Merge Request!
=============
All features tested and reached decent coverage status!

Coverage Status: 93%

Refer to (code_refactoring)