algorithm works with fake data now. yay! now to get real data
fixing more conflicts