Did some work, login still broken