Modify options to give end user over functionality

Modify core functionality to accept option parameters

Add support test case files