Some testing
Many changes