Some changes. Getting close