added more items, still needs more testing