Hoorayyy finally some progress being made