Merged header files and worked on item system.