FEATURE: ItemFactory overhaul

Some stuff still not working, ItemFactory not tested.