Committing some login changes. Still working on resolving the enum type