Bunch of changes. Login still not working.