Latest Local Version

Many changes occurred between the first and second commit, notably large
UI and inventory restructuring.