Working but with some bugs and mismatched data - still need login