Added testless functionality
Returning value. Not true.
Added more features, will break code