Refactored and updated item related files

Flagged any non-working functions.
Converted static functions to non-static.