Many changes. Still experimenting