Moved item code to its own file, etc