Move the rest of item location logic into another class