Some createItem refactoring ... still some to go