Almost work but registration doesn't yet