get working again and tests