Fixes #7, Only main issue. Ranging still needs work.

Signed-off-by: devxdev <xdev@devxdev.com>