Finish up auto-update functionality
Add ability to disable auto-updating