Work on this some more and add an update check