Auto Update

Still a WIP, not ready to merge