shubhamswe

Fixes # **[DO NOT REVIEW]** This PR is work in progress. - [x] Tests pass - [ ] Appropriate changes to README are included in PR