I've pushed another commit from ChatGPT, it's not a 100% yet but is getting closer.