Works a lot better now. Still need to parse the data