Added preliminary item finding system and cleaned up some code