More internal changes and a new craft item added. Expect some code rewriting in a later commit to accommodate upgrade components