Organizing

Getting prepped for autoUpdating