Tested changes on new itemmirror. Needs persistence