I think it's done; now it just needs comments for script
Ready for PR