Major re-haul some things still broken