Update to Latest Upstream

About to push changes for new update system