Working now
Many changes