Updated, almost done... almost