first, dont merge yet please, let me finish