Some changes, nothing quite working yet.