There's a few minor mistakes to fix, but it's a massive improvement over my last one.