First attempt at fixing the scripts

Things are still broken.