Updating my fork, almost done