Some changes. Still borked!