Split more things up and started inventory work.

RAGE RAGE RAGE