Pushing almost done

Updated!