Work in progress
Fixed issues
Tweaks and fixes

Signed-off-by: dchandekstark <dchandekstark@gmail.com>
Added tests; Tweaks and reorg