MJ's updates
Work on login model