Got adding weights working right again
merge conflicts. *crying*