Started real story-line and cleaned up Item API