Refactored to reorganize the file
Finished items functions api