Renamed item block and added a lot of TODOs noting ideas for later