added login - expect some git conflicts
merged hopefully