Started rewrite to use new item system