Cleanup, less use of external libraries
Inventory work, fix basic logic