All loginfunctionality completed, only polishing left