Allow for Weight to be set

Weight can be set as a percentage.
Fix conflict