Sync current

Does more stuff better, still broken.