commit from last night, still working on making the info card display everything correctly