More library work, some visual testing