Resolved merge conflicts
Restructured the way that weight values are stored on the user and fixed tests
Resolved merge fonclits