Added all the items from info gathering. Removed test from menu.