Pre forge Update commit

also did some work on upgradeable items