I also got weapon swapping integrated, a health bar added, and consumable items working.
I've got a few of the buttons setup and working. Pressing Q and E cycles through the weapons, space uses a poison potion (just a test item) and enter uses a healing potion.
...where to now? I've got to get controls hooked up and shooting done, but I think I need to get the entity system finished before I start that. So, I guess I'm off to finish the entity system.