Added tests
Commented the damn thing