category and othre stuff done
merged yaseen