login working, now just clena up