VERY close to being done with this beautiful update