Progress on Issue #3

Implemented and testing works pretty well