started testing
Fixed the bugginess