rewrote just about all the item code
updated for 1.5