Pulling up to date

integrating with the new item system