Adding code to staging branch

This code has been reviewed.
https://github.com/srijanaravali/yaspa/pull/36